Fix 'zfs change-key' with unencrypted child #9524
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jasonbking
reviewed
Oct 28, 2019
module/zfs/dsl_crypt.c
Outdated
| @@ -1452,7 +1452,11 @@ spa_keystore_change_key_sync_impl(uint64_t rddobj, uint64_t ddobj, | |||
| * Stop recursing if this dsl dir didn't inherit from the root | |||
| * or if this dd is a clone. | |||
| */ | |||
| VERIFY0(dsl_dir_get_encryption_root_ddobj(dd, &curr_rddobj)); | |||
| if (dsl_dir_get_encryption_root_ddobj(dd, &curr_rddobj) == ENOENT) { | |||
There was a problem hiding this comment.
What happens if this returns something other than 0 or ENOENT?
There was a problem hiding this comment.
I should probably add a VERIFY0() after the check. We shouldn't be able to hit any other error case in syncing context, in theory. In reality, we can probably hit an IO error here which isn't checked in the check function. I'm not sure if it would be a good idea to do that check though, because that function might have to recurse through an arbitrary number of datasets. For now. I will just add a VERIFY0()
tcaputi
force-pushed
the
fix_change_key_unencrypted
branch
from
2702f39 to
543f9bc
Compare
jasonbking
reviewed
Oct 28, 2019
module/zfs/dsl_crypt.c
Outdated
| VERIFY0(dsl_dir_get_encryption_root_ddobj(dd, &curr_rddobj)); | ||
| if (!skip && (curr_rddobj != rddobj || dsl_dir_is_clone(dd))) { | ||
|
|
||
| ret = dsl_dir_get_encryption_root_ddobj(dd, &curr_rddobj); |
There was a problem hiding this comment.
I don't know if it's a huge concern, but it looks like there's a chance a non-zero or non-ENOENT return could get past the VERIFY check by triggering the return path here (I realized that with my own attempt at this after my initial fix).
Codecov Report
@@ Coverage Diff @@
## master #9524 +/- ##
==========================================
- Coverage 79.16% 79% -0.17%
==========================================
Files 416 416
Lines 123661 123663 +2
==========================================
- Hits 97895 97697 -198
- Misses 25766 25966 +200
Continue to review full report at Codecov.
|
Currently, when you call 'zfs change-key' on an encrypted dataset that has an unencrypted child, the code will trigger a VERIFY. This VERIFY is leftover from before we allowed unencrypted datasets to exist underneath encrypted ones. This patch fixes the issue by simply replacing the VERIFY with an early return when recursing through datasets. Signed-off-by: Tom Caputi <tcaputi@datto.com>
tcaputi
force-pushed
the
fix_change_key_unencrypted
branch
from
543f9bc to
997916d
Compare
behlendorf
approved these changes
Oct 29, 2019
jasonbking
approved these changes
Oct 29, 2019
behlendorf
added
Status: Accepted
ikozhukhov
approved these changes
Oct 30, 2019
cvoltz
pushed a commit
to cvoltz/zfs
that referenced
this pull request
Nov 1, 2019
Currently, when you call 'zfs change-key' on an encrypted dataset that has an unencrypted child, the code will trigger a VERIFY. This VERIFY is leftover from before we allowed unencrypted datasets to exist underneath encrypted ones. This patch fixes the issue by simply replacing the VERIFY with an early return when recursing through datasets. Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Igor Kozhukhov <igor@dilos.org> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes openzfs#9524
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Dec 26, 2019
Currently, when you call 'zfs change-key' on an encrypted dataset that has an unencrypted child, the code will trigger a VERIFY. This VERIFY is leftover from before we allowed unencrypted datasets to exist underneath encrypted ones. This patch fixes the issue by simply replacing the VERIFY with an early return when recursing through datasets. Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Igor Kozhukhov <igor@dilos.org> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes openzfs#9524
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Dec 27, 2019
Currently, when you call 'zfs change-key' on an encrypted dataset that has an unencrypted child, the code will trigger a VERIFY. This VERIFY is leftover from before we allowed unencrypted datasets to exist underneath encrypted ones. This patch fixes the issue by simply replacing the VERIFY with an early return when recursing through datasets. Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Igor Kozhukhov <igor@dilos.org> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes openzfs#9524
tonyhutter
pushed a commit
that referenced
this pull request
Jan 23, 2020
Currently, when you call 'zfs change-key' on an encrypted dataset that has an unencrypted child, the code will trigger a VERIFY. This VERIFY is leftover from before we allowed unencrypted datasets to exist underneath encrypted ones. This patch fixes the issue by simply replacing the VERIFY with an early return when recursing through datasets. Reviewed by: Jason King <jason.brian.king@gmail.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Igor Kozhukhov <igor@dilos.org> Signed-off-by: Tom Caputi <tcaputi@datto.com> Closes #9524
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, when you call 'zfs change-key' on an encrypted dataset
that has an unencrypted child, the code will trigger a VERIFY.
This VERIFY is leftover from before we allowed unencrypted
datasets to exist underneath encrypted ones. This patch fixes the
issue by simply replacing the VERIFY with an early return when
recursing through datasets.
Signed-off-by: Tom Caputi tcaputi@datto.com
Types of changes
Checklist:
Signed-off-by.